Fix #3912: Account for units and blocks in inline and macros #4012
+69
−4
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.